Fix checking of the guard condition. #204
Merged
+15
−10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, when we were checking if a guard condition was triggered, we would actually check and reset it. But that means that when we later on went to set the appropriate things in the wait_set, we wouldn't actually set the guard_condition true, since it was false by that point. Instead, add in two separate methods; the one that just returns whether it is triggered, which we call when checking, and the one that checks and resets, which we call when setting it in the wait_set. Signed-off-by: Chris Lalancette <[email protected]>
clalancette
force-pushed
the
clalancette/fix-guard-condition
branch
from
1a2d40a to
fb24401
Compare
Signed-off-by: Yadunund <[email protected]>
Yadunund
approved these changes
Jun 21, 2024
| @@ -3143,14 +3143,12 @@ static bool has_triggered_condition( | |||
| rmw_clients_t * clients, | |||
| rmw_events_t * events) | |||
| { | |||
| static_cast<void>(events); | |||
There was a problem hiding this comment.
wow does this mean we were never actually checking for events?
There was a problem hiding this comment.
No, the code for checking events is down below. We just forgot to remove this (dead) line of code when we actually did implement events.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, when we were checking if a guard condition was triggered, we would actually check and reset it. But that means that when we later on went to set the appropriate things in the wait_set, we wouldn't actually set the guard_condition true, since it was false by that point.
Instead, add in two separate methods; the one that just returns whether it is triggered, which we call when checking, and the one that checks and resets, which we call when setting it in the wait_set.